Removing flag OperationInReleasingDataSource from DataGridView.cs #13362
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the handling of the OperationInReleasingDataSource flag and the subsequent cleanup of the DataGridView’s state when a bound data source is disposed. Key changes include removing the inline try–finally block that set the flag and reset CurrentCell from DataGridView.cs and moving that logic into a new dedicated method, OnDataSourceDisposed, in DataGridView.Methods.cs.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridView.cs | Removed the inline try–finally disposal block so that the flag and CurrentCell reset are handled by OnDataSourceDisposed. |
| src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridView.Methods.cs | Added a new OnDataSourceDisposed method that wraps setting DataSource and resetting CurrentCell within a try–finally block. |
Comments suppressed due to low confidence (1)
src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridView.cs:1922
- Verify that removing the inline try–finally block which sets _dataGridViewOper and resets CurrentCell does not affect any existing side effects in the property setter; ensure that all necessary state cleanup is now correctly handled by OnDataSourceDisposed.
- _dataGridViewOper[OperationInReleasingDataSource] = true;
src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridView.Methods.cs
Outdated
Show resolved
Hide resolved
src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridView.Methods.cs
Outdated
Show resolved
Hide resolved
src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridView.cs
Show resolved
Hide resolved
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #13362 +/- ##
====================================================
+ Coverage 62.59209% 95.69342% +33.10133%
====================================================
Files 1560 542 -1018
Lines 159763 63461 -96302
Branches 14915 1451 -13464
====================================================
- Hits 99999 60728 -39271
+ Misses 58988 2400 -56588
+ Partials 776 333 -443
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
LeafShi1
force-pushed
the
Moving-the-tag-OperationInReleasingDataSource-to-OnDataSourceDisposed
branch
from
4c202f0 to
f0546b8
Compare
LeafShi1
force-pushed
the
Moving-the-tag-OperationInReleasingDataSource-to-OnDataSourceDisposed
branch
from
c0ff14b to
31d5a9b
Compare
src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridView.Methods.cs
Outdated
Show resolved
Hide resolved
Tanya-Solyanik
added
the
waiting-author-feedback
LeafShi1
removed
the
waiting-author-feedback
Tanya-Solyanik
approved these changes
Apr 24, 2025
|
PLease update the servicing PRs |
LeafShi1
added a commit
to LeafShi1/winforms
that referenced
this pull request
Apr 25, 2025
…sposed" (dotnet#13362) * Removing tag OperationInReleasingDataSource * Add judgment IsHandleCreated to before defining currentCell in function SetCurrentCellAddressCore
LeafShi1
added a commit
to LeafShi1/winforms
that referenced
this pull request
Apr 25, 2025
…sposed" (dotnet#13362) * Removing tag OperationInReleasingDataSource * Add judgment IsHandleCreated to before defining currentCell in function SetCurrentCellAddressCore
LeafShi1
added a commit
that referenced
this pull request
Apr 25, 2025
…sposed" (#13362) * Removing tag OperationInReleasingDataSource * Add judgment IsHandleCreated to before defining currentCell in function SetCurrentCellAddressCore
LeafShi1
added a commit
that referenced
this pull request
Apr 25, 2025
…sposed" (#13362) * Removing tag OperationInReleasingDataSource * Add judgment IsHandleCreated to before defining currentCell in function SetCurrentCellAddressCore
LeafShi1
changed the title
LeafShi1
deleted the
Moving-the-tag-OperationInReleasingDataSource-to-OnDataSourceDisposed
branch
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #13304
Proposed changes
This is a supplemental fix to PR Add _isReleasingDataSource to prevent unnecessary operations on CurrentCell when changing or releasing DataSource #13320
Add judgment
IsHandleCreatedbefore invokingEndEditto avoid the exceptionMicrosoft Reviewers: Open in CodeFlow